popup: Include active item as part of the submenu

diff --git a/data/theme/_common.scss b/data/theme/_common.scss
index 589550bcbf306e87275d40970726999b1394bb9b..2c42f1b71b76385b6523663c9f036f800270d81b 100644 (file)
--- a/data/theme/_common.scss
+++ b/data/theme/_common.scss
@@ -412,8 +412,7 @@ StScrollBar {
   .popup-menu-arrow { } //defined globally in the TOP BAR
   .popup-sub-menu {
     background-color: darken($bg_color,2%);
-    border-top: 1px solid lighten($borders_color,5%);
-    border-bottom: 1px solid lighten($borders_color,5%);
+    box-shadow: inset 0 -1px 0px lighten($borders_color,5%);
   }
   
   .popup-menu-content { padding: 1em 0em; }
@@ -422,6 +421,10 @@ StScrollBar {
     
     &:ltr { padding: .4em 1.75em .4em 0em; }
     &:rtl { padding: .4em 0em .4em 1.75em; }
+    &:checked {
+      background-color: darken($bg_color,2%);
+      box-shadow: inset 0 1px 0px lighten($borders_color,5%);
+    }
     &:active { background-color: $selected_bg_color; }
     &:insensitive { background-color: transparentize($bg_color,.5); }
   }

diff --git a/data/theme/gnome-shell-high-contrast.css b/data/theme/gnome-shell-high-contrast.css
index 2151e55385a9fc3e0f3dbc43d07bdf1e5df6f1e9..0c21596d912cb516e59ef7879afeef53dea86c17 100644 (file)
--- a/data/theme/gnome-shell-high-contrast.css
+++ b/data/theme/gnome-shell-high-contrast.css
@@ -751,8 +751,7 @@ StScrollBar {
   min-width: 200px; }
   .popup-menu .popup-sub-menu {
     background-color: black;
-    border-top: 1px solid #0d0d0d;
-    border-bottom: 1px solid #0d0d0d; }
+    box-shadow: inset 0 -1px 0px #0d0d0d; }
   .popup-menu .popup-menu-content {
     padding: 1em 0em; }
   .popup-menu .popup-menu-item {
@@ -761,6 +760,9 @@ StScrollBar {
       padding: .4em 1.75em .4em 0em; }
     .popup-menu .popup-menu-item:rtl {
       padding: .4em 0em .4em 1.75em; }
+    .popup-menu .popup-menu-item:checked {
+      background-color: black;
+      box-shadow: inset 0 1px 0px #0d0d0d; }
     .popup-menu .popup-menu-item:active {
       background-color: #215d9c; }
     .popup-menu .popup-menu-item:insensitive {

diff --git a/data/theme/gnome-shell.css b/data/theme/gnome-shell.css
index 804b6f6777ef51c3d225b4ede63590e2b81ec77b..0a669fefbbb79aa1c399acf3af5a1d0a9ccf99c5 100644 (file)
--- a/data/theme/gnome-shell.css
+++ b/data/theme/gnome-shell.css
@@ -751,8 +751,7 @@ StScrollBar {
   min-width: 200px; }
   .popup-menu .popup-sub-menu {
     background-color: #343a3a;
-    border-top: 1px solid #282c2c;
-    border-bottom: 1px solid #282c2c; }
+    box-shadow: inset 0 -1px 0px #282c2c; }
   .popup-menu .popup-menu-content {
     padding: 1em 0em; }
   .popup-menu .popup-menu-item {
@@ -761,6 +760,9 @@ StScrollBar {
       padding: .4em 1.75em .4em 0em; }
     .popup-menu .popup-menu-item:rtl {
       padding: .4em 0em .4em 1.75em; }
+    .popup-menu .popup-menu-item:checked {
+      background-color: #343a3a;
+      box-shadow: inset 0 1px 0px #282c2c; }
     .popup-menu .popup-menu-item:active {
       background-color: #215d9c; }
     .popup-menu .popup-menu-item:insensitive {

diff --git a/js/ui/popupMenu.js b/js/ui/popupMenu.js
index 524191edcf4d3efa09b3f56ff5a4a3cd324ea1c6..5b0db0301e3367e0fcf77c6b7ce337f5e0d5d7f9 100644 (file)
--- a/js/ui/popupMenu.js
+++ b/js/ui/popupMenu.js
@@ -1075,10 +1075,12 @@ const PopupSubMenuMenuItem = new Lang.Class({
             this.actor.add_style_pseudo_class('open');
             this._getTopMenu()._setOpenedSubMenu(this.menu);
             this.actor.add_accessible_state (Atk.StateType.EXPANDED);
+            this.actor.add_style_pseudo_class('checked');
         } else {
             this.actor.remove_style_pseudo_class('open');
             this._getTopMenu()._setOpenedSubMenu(null);
             this.actor.remove_accessible_state (Atk.StateType.EXPANDED);
+            this.actor.remove_style_pseudo_class('checked');
         }
     },